fix based on rc6

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

cmd/oci-runtime-tool/generate.go

@@ -383,7 +383,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	}
 
 	if context.IsSet("linux-oom-score-adj") {
-		g.SetLinuxResourcesOOMScoreAdj(context.Int("linux-oom-score-adj"))
+		g.SetProcessOOMScoreAdj(context.Int("linux-oom-score-adj"))
 	}
 
 	if context.IsSet("linux-cpu-shares") {
@@ -419,23 +419,23 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	}
 
 	if context.IsSet("linux-mem-limit") {
-		g.SetLinuxResourcesMemoryLimit(context.Uint64("linux-mem-limit"))
+		g.SetLinuxResourcesMemoryLimit(context.Int64("linux-mem-limit"))
 	}
 
 	if context.IsSet("linux-mem-reservation") {
-		g.SetLinuxResourcesMemoryReservation(context.Uint64("linux-mem-reservation"))
+		g.SetLinuxResourcesMemoryReservation(context.Int64("linux-mem-reservation"))
 	}
 
 	if context.IsSet("linux-mem-swap") {
-		g.SetLinuxResourcesMemorySwap(context.Uint64("linux-mem-swap"))
+		g.SetLinuxResourcesMemorySwap(context.Int64("linux-mem-swap"))
 	}
 
 	if context.IsSet("linux-mem-kernel-limit") {
-		g.SetLinuxResourcesMemoryKernel(context.Uint64("linux-mem-kernel-limit"))
+		g.SetLinuxResourcesMemoryKernel(context.Int64("linux-mem-kernel-limit"))
 	}
 
 	if context.IsSet("linux-mem-kernel-tcp") {
-		g.SetLinuxResourcesMemoryKernelTCP(context.Uint64("linux-mem-kernel-tcp"))
+		g.SetLinuxResourcesMemoryKernelTCP(context.Int64("linux-mem-kernel-tcp"))
 	}
 
 	if context.IsSet("linux-mem-swappiness") {

cmd/runtimetest/main.go

@@ -431,8 +431,8 @@ func validateROPaths(spec *rspec.Spec) error {
 }
 
 func validateOOMScoreAdj(spec *rspec.Spec) error {
-	if spec.Linux.Resources != nil && spec.Linux.Resources.OOMScoreAdj != nil {
-		expected := *spec.Linux.Resources.OOMScoreAdj
+	if spec.Process != nil && spec.Process.OOMScoreAdj != nil {
+		expected := *spec.Process.OOMScoreAdj
 		f, err := os.Open("/proc/self/oom_score_adj")
 		if err != nil {
 			return err

generate/generate.go

@@ -34,11 +34,11 @@ type ExportOptions struct {
 func New() Generator {
 	spec := rspec.Spec{
 		Version: rspec.Version,
-		Root: rspec.Root{
+		Root: &rspec.Root{
 			Path:     "",
 			Readonly: false,
 		},
-		Process: rspec.Process{
+		Process: &rspec.Process{
 			Terminal: false,
 			User:     rspec.User{},
 			Args: []string{
@@ -131,7 +131,7 @@ func New() Generator {
 					"CAP_AUDIT_WRITE",
 				},
 			},
-			Rlimits: []rspec.LinuxRlimit{
+			Rlimits: []rspec.POSIXRlimit{
 				{
 					Type: "RLIMIT_NOFILE",
 					Hard: uint64(1024),
@@ -417,7 +417,7 @@ func (g *Generator) AddProcessRlimits(rType string, rHard uint64, rSoft uint64)
 		}
 	}
 
-	newRlimit := rspec.LinuxRlimit{
+	newRlimit := rspec.POSIXRlimit{
 		Type: rType,
 		Hard: rHard,
 		Soft: rSoft,
@@ -444,7 +444,7 @@ func (g *Generator) ClearProcessRlimits() {
 	if g.spec == nil {
 		return
 	}
-	g.spec.Process.Rlimits = []rspec.LinuxRlimit{}
+	g.spec.Process.Rlimits = []rspec.POSIXRlimit{}
 }
 
 // ClearProcessAdditionalGids clear g.spec.Process.AdditionalGids.
@@ -490,10 +490,10 @@ func (g *Generator) SetLinuxResourcesDisableOOMKiller(disable bool) {
 	g.spec.Linux.Resources.DisableOOMKiller = &disable
 }
 
-// SetLinuxResourcesOOMScoreAdj sets g.spec.Linux.Resources.OOMScoreAdj.
-func (g *Generator) SetLinuxResourcesOOMScoreAdj(adj int) {
-	g.initSpecLinuxResources()
-	g.spec.Linux.Resources.OOMScoreAdj = &adj
+// SetProcessOOMScoreAdj sets g.spec.Process.OOMScoreAdj.
+func (g *Generator) SetProcessOOMScoreAdj(adj int) {
+	g.initSpec()
+	g.spec.Process.OOMScoreAdj = &adj
 }
 
 // SetLinuxResourcesCPUShares sets g.spec.Linux.Resources.CPU.Shares.
@@ -539,31 +539,31 @@ func (g *Generator) SetLinuxResourcesCPUMems(mems string) {
 }
 
 // SetLinuxResourcesMemoryLimit sets g.spec.Linux.Resources.Memory.Limit.
-func (g *Generator) SetLinuxResourcesMemoryLimit(limit uint64) {
+func (g *Generator) SetLinuxResourcesMemoryLimit(limit int64) {
 	g.initSpecLinuxResourcesMemory()
 	g.spec.Linux.Resources.Memory.Limit = &limit
 }
 
 // SetLinuxResourcesMemoryReservation sets g.spec.Linux.Resources.Memory.Reservation.
-func (g *Generator) SetLinuxResourcesMemoryReservation(reservation uint64) {
+func (g *Generator) SetLinuxResourcesMemoryReservation(reservation int64) {
 	g.initSpecLinuxResourcesMemory()
 	g.spec.Linux.Resources.Memory.Reservation = &reservation
 }
 
 // SetLinuxResourcesMemorySwap sets g.spec.Linux.Resources.Memory.Swap.
-func (g *Generator) SetLinuxResourcesMemorySwap(swap uint64) {
+func (g *Generator) SetLinuxResourcesMemorySwap(swap int64) {
 	g.initSpecLinuxResourcesMemory()
 	g.spec.Linux.Resources.Memory.Swap = &swap
 }
 
 // SetLinuxResourcesMemoryKernel sets g.spec.Linux.Resources.Memory.Kernel.
-func (g *Generator) SetLinuxResourcesMemoryKernel(kernel uint64) {
+func (g *Generator) SetLinuxResourcesMemoryKernel(kernel int64) {
 	g.initSpecLinuxResourcesMemory()
 	g.spec.Linux.Resources.Memory.Kernel = &kernel
 }
 
 // SetLinuxResourcesMemoryKernelTCP sets g.spec.Linux.Resources.Memory.KernelTCP.
-func (g *Generator) SetLinuxResourcesMemoryKernelTCP(kernelTCP uint64) {
+func (g *Generator) SetLinuxResourcesMemoryKernelTCP(kernelTCP int64) {
 	g.initSpecLinuxResourcesMemory()
 	g.spec.Linux.Resources.Memory.KernelTCP = &kernelTCP
 }

validate/validate.go

@@ -668,7 +668,7 @@ func envValid(env string) bool {
 	return true
 }
 
-func (v *Validator) rlimitValid(rlimit rspec.LinuxRlimit) (msgs []string) {
+func (v *Validator) rlimitValid(rlimit rspec.POSIXRlimit) (msgs []string) {
 	if rlimit.Hard < rlimit.Soft {
 		msgs = append(msgs, fmt.Sprintf("hard limit of rlimit %s should not be less than soft limit", rlimit.Type))
 	}

validate/validate_test.go

@@ -47,7 +47,7 @@ func TestCheckRootfsPath(t *testing.T) {
 		{filepath.Join(tmpBundle, rootfsNonExists), false},
 	}
 	for _, c := range cases {
-		v := NewValidator(&rspec.Spec{Root: rspec.Root{Path: c.val}}, tmpBundle, false, "linux")
+		v := NewValidator(&rspec.Spec{Root: &rspec.Root{Path: c.val}}, tmpBundle, false, "linux")
 		checkErrors(t, "CheckRootfsPath "+c.val, v.CheckRootfsPath(), c.expected)
 	}
 }