Merge pull request #603 from q384566678/deviceValid-fix

validate: mv deviceValid to validate_linux

Author: liangchenye

validate/validate.go

@@ -747,22 +747,6 @@ func (v *Validator) rlimitValid(rlimit rspec.POSIXRlimit) (errs error) {
 	return
 }
 
-func deviceValid(d rspec.LinuxDevice) bool {
-	switch d.Type {
-	case "b", "c", "u":
-		if d.Major <= 0 || d.Minor <= 0 {
-			return false
-		}
-	case "p":
-		if d.Major != 0 || d.Minor != 0 {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}
-
 func isStruct(t reflect.Type) bool {
 	return t.Kind() == reflect.Struct
 }

validate/validate_linux.go

@@ -30,6 +30,22 @@ func LastCap() capability.Cap {
 	return last
 }
 
+func deviceValid(d rspec.LinuxDevice) bool {
+	switch d.Type {
+	case "b", "c", "u":
+		if d.Major <= 0 || d.Minor <= 0 {
+			return false
+		}
+	case "p":
+		if d.Major != 0 || d.Minor != 0 {
+			return false
+		}
+	default:
+		return false
+	}
+	return true
+}
+
 // CheckLinux checks v.spec.Linux
 func (v *Validator) CheckLinux() (errs error) {
 	logrus.Debugf("check linux")