qemu,qmp: Add staticcheck to travis and fix errors

This commit enables staticcheck in the travis builds and fixes the existing
errors detected by staticcheck.  There was one type of error repeated in
qemu.go in which the type of some constants was not explicitly specified.

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
This commit is contained in:
Mark Ryan 2018-06-28 15:11:13 +01:00
parent ff2401825e
commit ffc06e6bc4
3 changed files with 31 additions and 29 deletions

View File

@ -19,4 +19,4 @@ before_install:
script:
- go env
- $GOPATH/bin/goveralls -v -service=travis-ci
- gometalinter --tests --vendor --disable-all --enable=misspell --enable=vet --enable=ineffassign --enable=gofmt --enable=gocyclo --cyclo-over=15 --enable=golint --enable=errcheck --enable=deadcode ./...
- gometalinter --tests --vendor --disable-all --enable=misspell --enable=vet --enable=ineffassign --enable=gofmt --enable=gocyclo --cyclo-over=15 --enable=golint --enable=errcheck --enable=deadcode --enable=staticcheck ./...

View File

@ -63,25 +63,25 @@ const (
NVDIMM DeviceDriver = "nvdimm"
// Virtio9P is the 9pfs device driver.
Virtio9P = "virtio-9p-pci"
Virtio9P DeviceDriver = "virtio-9p-pci"
// VirtioNet is the virt-io networking device driver.
VirtioNet = "virtio-net"
VirtioNet DeviceDriver = "virtio-net"
// VirtioNetPCI is the virt-io pci networking device driver.
VirtioNetPCI = "virtio-net-pci"
VirtioNetPCI DeviceDriver = "virtio-net-pci"
// VirtioSerial is the serial device driver.
VirtioSerial = "virtio-serial-pci"
VirtioSerial DeviceDriver = "virtio-serial-pci"
// VirtioBlock is the block device driver.
VirtioBlock = "virtio-blk"
VirtioBlock DeviceDriver = "virtio-blk"
// Console is the console device driver.
Console = "virtconsole"
Console DeviceDriver = "virtconsole"
// VirtioSerialPort is the serial port device driver.
VirtioSerialPort = "virtserialport"
VirtioSerialPort DeviceDriver = "virtserialport"
)
// ObjectType is a string representing a qemu object type.
@ -168,10 +168,10 @@ const (
Local FSDriver = "local"
// Handle is the handle qemu filesystem driver.
Handle = "handle"
Handle FSDriver = "handle"
// Proxy is the proxy qemu filesystem driver.
Proxy = "proxy"
Proxy FSDriver = "proxy"
)
const (
@ -179,13 +179,13 @@ const (
None SecurityModelType = "none"
// PassThrough uses the same credentials on both the host and guest.
PassThrough = "passthrough"
PassThrough SecurityModelType = "passthrough"
// MappedXattr stores some files attributes as extended attributes.
MappedXattr = "mapped-xattr"
MappedXattr SecurityModelType = "mapped-xattr"
// MappedFile stores some files attributes in the .virtfs directory.
MappedFile = "mapped-file"
MappedFile SecurityModelType = "mapped-file"
)
// FSDevice represents a qemu filesystem configuration.
@ -256,19 +256,19 @@ const (
Pipe CharDeviceBackend = "pipe"
// Socket creates a 2 way stream socket (TCP or Unix).
Socket = "socket"
Socket CharDeviceBackend = "socket"
// CharConsole sends traffic from the guest to QEMU's standard output.
CharConsole = "console"
CharConsole CharDeviceBackend = "console"
// Serial sends traffic from the guest to a serial device on the host.
Serial = "serial"
Serial CharDeviceBackend = "serial"
// TTY is an alias for Serial.
TTY = "tty"
TTY CharDeviceBackend = "tty"
// PTY creates a new pseudo-terminal on the host and connect to it.
PTY = "pty"
PTY CharDeviceBackend = "pty"
)
// CharDevice represents a qemu character device.
@ -345,19 +345,19 @@ const (
TAP NetDeviceType = "tap"
// MACVTAP is a macvtap networking device type.
MACVTAP = "macvtap"
MACVTAP NetDeviceType = "macvtap"
// IPVTAP is a ipvtap virtual networking device type.
IPVTAP = "ipvtap"
IPVTAP NetDeviceType = "ipvtap"
// VETHTAP is a veth-tap virtual networking device type.
VETHTAP = "vethtap"
VETHTAP NetDeviceType = "vethtap"
// VFIO is a direct assigned PCI device or PCI VF
VFIO = "VFIO"
VFIO NetDeviceType = "VFIO"
// VHOSTUSER is a vhost-user port (socket)
VHOSTUSER = "vhostuser"
VHOSTUSER NetDeviceType = "vhostuser"
)
// QemuNetdevParam converts to the QEMU -netdev parameter notation
@ -634,7 +634,7 @@ const (
NoInterface BlockDeviceInterface = "none"
// SCSI represents a SCSI block device interface.
SCSI = "scsi"
SCSI BlockDeviceInterface = "scsi"
)
const (
@ -642,7 +642,7 @@ const (
Threads BlockDeviceAIO = "threads"
// Native is the pthread asynchronous I/O implementation.
Native = "native"
Native BlockDeviceAIO = "native"
)
const (
@ -967,7 +967,9 @@ type VSOCKDevice struct {
const (
// MinimalGuestCID is the smallest valid context ID for a guest.
MinimalGuestCID uint32 = 3
)
const (
// VhostVSOCKPCI is the VSOCK vhost device type.
VhostVSOCKPCI = "vhost-vsock-pci"
@ -1010,7 +1012,7 @@ const (
UTC RTCBaseType = "utc"
// LocalTime is the local base time for qemu RTC.
LocalTime = "localtime"
LocalTime RTCBaseType = "localtime"
)
const (
@ -1018,7 +1020,7 @@ const (
Host RTCClock = "host"
// VM is for using the guest clock as a reference
VM = "vm"
VM RTCClock = "vm"
)
const (
@ -1026,7 +1028,7 @@ const (
Slew RTCDriftFix = "slew"
// NoDriftFix means we don't want/need to fix qemu's RTC drift.
NoDriftFix = "none"
NoDriftFix RTCDriftFix = "none"
)
// RTC represents a qemu Real Time Clock configuration.

View File

@ -415,7 +415,7 @@ func (q *QMP) mainLoop() {
close(q.disconnectedCh)
}()
version := []byte{}
var version []byte
var cmdDoneCh <-chan struct{}
DONE: