github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 21:02:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #952 from alicefr/utils_linux_fix

Browse Source 
virtcontainers: change uint32 to uint64 for ioctl
This commit is contained in:
Frank Cao 2018-11-30 09:56:39 +08:00 committed by GitHub
commit 6edb3618f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/utils/utils_linux.go
View File

@ -24,7 +24,7 @@ var ioctlFunc = ioctl
var maxUInt uint32 = 1<<32 - 1 var maxUInt uint32 = 1<<32 - 1
func ioctl(fd uintptr, request int, arg1 uint32) error { func ioctl(fd uintptr, request int, arg1 uint64) error {
if _, _, errno := unix.Syscall( if _, _, errno := unix.Syscall(
unix.SYS_IOCTL, unix.SYS_IOCTL,
fd, fd,
@ -72,14 +72,14 @@ func FindContextID() (*os.File, uint32, error) {
// Looking for the first available context ID. // Looking for the first available context ID.
for cid := contextID; cid <= maxUInt; cid++ { for cid := contextID; cid <= maxUInt; cid++ {
if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, cid); err == nil { if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uint64(cid)); err == nil {
return vsockFd, cid, nil return vsockFd, cid, nil
} }
} }
// Last chance to get a free context ID. // Last chance to get a free context ID.
for cid := contextID - 1; cid >= firstContextID; cid-- { for cid := contextID - 1; cid >= firstContextID; cid-- {
if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, cid); err == nil { if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uint64(cid)); err == nil {
return vsockFd, cid, nil return vsockFd, cid, nil
} }
} }

2
virtcontainers/utils/utils_linux_test.go
View File

@ -15,7 +15,7 @@ import (
func TestFindContextID(t *testing.T) { func TestFindContextID(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
ioctlFunc = func(fd uintptr, request int, arg1 uint32) error { ioctlFunc = func(fd uintptr, request int, arg1 uint64) error {
return errors.New("ioctl") return errors.New("ioctl")
} }