From 814cea9601668e082d39a36b941eaf4997bb8205 Mon Sep 17 00:00:00 2001 From: Yujia Qiao Date: Tue, 24 Aug 2021 16:04:34 +0800 Subject: [PATCH] virtcontainers: clean up useless code Fixes: #2275 Signed-off-by: Yujia Qiao --- src/runtime/virtcontainers/utils/utils_linux.go | 4 ---- src/runtime/virtcontainers/utils/utils_linux_generic.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/runtime/virtcontainers/utils/utils_linux.go b/src/runtime/virtcontainers/utils/utils_linux.go index 3c14e0cda6..90e0d631bb 100644 --- a/src/runtime/virtcontainers/utils/utils_linux.go +++ b/src/runtime/virtcontainers/utils/utils_linux.go @@ -28,9 +28,6 @@ var maxUInt uint64 = 1<<32 - 1 func Ioctl(fd uintptr, request, data uintptr) error { if _, _, errno := unix.Syscall(unix.SYS_IOCTL, fd, request, data); errno != 0 { - //uintptr(request) - //uintptr(unsafe.Pointer(&arg1)), - //); errno != 0 { return os.NewSyscallError("ioctl", fmt.Errorf("%d", int(errno))) } @@ -77,7 +74,6 @@ func FindContextID() (*os.File, uint64, error) { } } - ioctlVhostVsockSetGuestCid := getIoctlVhostVsockGuestCid() // Last chance to get a free context ID. for cid := contextID - 1; cid >= firstContextID; cid-- { if err = ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil { diff --git a/src/runtime/virtcontainers/utils/utils_linux_generic.go b/src/runtime/virtcontainers/utils/utils_linux_generic.go index bd99f530bf..6e69bf928d 100644 --- a/src/runtime/virtcontainers/utils/utils_linux_generic.go +++ b/src/runtime/virtcontainers/utils/utils_linux_generic.go @@ -10,7 +10,3 @@ package utils // from // VHOST_VSOCK_SET_GUEST_CID = _IOW(VHOST_VIRTIO, 0x60, __u64) const ioctlVhostVsockSetGuestCid = 0x4008AF60 - -func getIoctlVhostVsockGuestCid() uintptr { - return ioctlVhostVsockSetGuestCid -}