Finish "iolimit" command

cmd/iolimit/iolimit.go

@@ -2,8 +2,11 @@ package iolimit
 
 import (
 	"errors"
+	"fmt"
+	"strings"
 
 	"github.com/USTC-vlab/vct/pkg/cgroup"
+	"github.com/USTC-vlab/vct/pkg/pve"
 	"github.com/spf13/cobra"
 )
 
@@ -16,8 +19,8 @@ func MakeCmd() *cobra.Command {
 	}
 	flags := cmd.Flags()
 	var iops cgroup.IOPS
-	flags.Int64VarP(&iops.Rbps, "rbps", "", 0, "set read bandwidth limit")
-	flags.Int64VarP(&iops.Wbps, "wbps", "", 0, "set write bandwidth limit")
+	flags.Int64VarP(&iops.Rbps, "rbps", "R", 0, "set read bandwidth limit")
+	flags.Int64VarP(&iops.Wbps, "wbps", "W", 0, "set write bandwidth limit")
 	flags.Int64VarP(&iops.Riops, "riops", "r", 0, "set read IOPS limit")
 	flags.Int64VarP(&iops.Wiops, "wiops", "w", 0, "set write IOPS limit")
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
@@ -34,10 +37,29 @@ func MakeCmd() *cobra.Command {
 }
 
 func iolimitMain(ctid string, iops cgroup.IOPS) error {
-	// TODO: Find major:minor
+	pveStorage, err := pve.GetStorage()
+	if err != nil {
+		return err
+	}
+
+	config, err := pve.GetLXCConfig(ctid)
+	if err != nil {
+		return err
+	}
+	rootfs := config["rootfs"]
+	rootfsIdent := strings.SplitN(rootfs, ",", 2)[0]
+	rootfsParts := strings.Split(rootfsIdent, ":")
+	if len(rootfsParts) != 2 {
+		return fmt.Errorf("invalid rootfs %s", rootfsIdent)
+	}
+
+	major, minor, err := pve.GetBlockDevForStorage(rootfsParts[0], rootfsParts[1], pveStorage)
+	if err != nil {
+		return err
+	}
 	iopsline := cgroup.IOPSLine{
-		Major: 0,
-		Minor: 0,
+		Major: major,
+		Minor: minor,
 		IOPS:  iops,
 	}
 	return cgroup.SetIOPSForLXC(ctid, iopsline)

pkg/pve/pct.go

@@ -36,7 +36,7 @@ func parseConfig(r io.Reader) map[string]string {
 			// Invalid line?
 			continue
 		}
-		config[fields[0]] = fields[1]
+		config[strings.TrimSuffix(fields[0], ":")] = fields[1]
 	}
 	return config
 }
@@ -45,7 +45,7 @@ func GetConfig(typ, vmid string) (map[string]string, error) {
 	if typ == "qemu" {
 		typ = "qemu-server"
 	}
-	f, err := os.Open(fmt.Sprintf("%s/%s/%s.cfg", EtcPve, typ, vmid))
+	f, err := os.Open(fmt.Sprintf("%s/%s/%s.conf", EtcPve, typ, vmid))
 	if err != nil {
 		return nil, err
 	}

pkg/pve/storage.go

@@ -103,7 +103,7 @@ func getBlockDevForLVM(vgname, lvname string) (uint64, uint64, error) {
 // The "aux" parameter is used to help determine the type of the storage.
 func GetBlockDevForStorage(storage, name string, aux []PVEStorage) (uint64, uint64, error) {
 	i := slices.IndexFunc(aux, func(s PVEStorage) bool {
-		return s.Name == name
+		return s.Name == storage
 	})
 	if i == -1 {
 		return 0, 0, fs.ErrNotExist