fix igvmmeasure build

Author: danko-miladinovic

init/init.sh

@@ -25,7 +25,7 @@ MNT_DIR=/root
 BASE=$(pwd)
 
 SRC=/dev/nbd2
-SRC_IP=147.91.12.238
+SRC_IP=10.172.192.30
 SRC_PORT=10809
 
 DST=/dev/sda

manager/qemu/config.go

@@ -74,10 +74,11 @@ type IGVMConfig struct {
 }
 
 type DiskConfig struct {
-	File   string `env:"DISK_FILE"   envDefault:"img/enc_os.qcow2"`
-	ID     string `env:"DISK_ID"     envDefault:"disk0"`
-	Format string `env:"DISK_FORMAT" envDefault:"qcow2"`
-	SCSIID string `env:"DISK_SCSI_ID" envDefault:"scsi0"`
+	SrcFile string `env:"SRC_DISK_FILE"   envDefault:"img/enc_os.qcow2"`
+	DstFile string `env:"DST_DISK_FILE"   envDefault:"img/enc_os.qcow2"`
+	ID      string `env:"DISK_ID"     envDefault:"disk0"`
+	Format  string `env:"DISK_FORMAT" envDefault:"qcow2"`
+	SCSIID  string `env:"DISK_SCSI_ID" envDefault:"scsi0"`
 }
 
 type Config struct {
@@ -192,7 +193,7 @@ func (config Config) ConstructQemuArgs() []string {
 		// disk image
 		args = append(args, "-drive",
 			fmt.Sprintf("file=%s,if=none,id=%s,format=%s",
-				config.DiskConfig.File,
+				config.DiskConfig.DstFile,
 				config.DiskConfig.ID,
 				config.DiskConfig.Format))
 		args = append(args, "-device",

manager/qemu/vm.go

@@ -3,6 +3,7 @@
 package qemu
 
 import (
+	"encoding/json"
 	"fmt"
 	"log/slog"
 	"os"
@@ -22,6 +23,7 @@ const (
 	KernelFile      = "bzImage"
 	rootfsFile      = "rootfs.cpio"
 	tmpDir          = "/tmp"
+	diskDstName     = "cvmDisk"
 	interval        = 5 * time.Second
 	shutdownTimeout = 30 * time.Second
 )
@@ -39,6 +41,10 @@ type qemuVM struct {
 	vm.StateMachine
 }
 
+type qemuInfo struct {
+	VirtualSize int64 `json:"virtual-size"`
+}
+
 func NewVM(config any, cvmId string, logger *slog.Logger) vm.VM {
 	return &qemuVM{
 		vmi:          config.(VMInfo),
@@ -75,6 +81,22 @@ func (v *qemuVM) Start() (err error) {
 		v.vmi.Config.OVMFVarsConfig.File = dstFile
 	}
 
+	if v.vmi.Config.EnableDisk {
+		sizeGB, err := GetVirtualSizeGB(v.vmi.Config.SrcFile)
+		if err != nil {
+			return err
+		}
+
+		dstDiskFile := fmt.Sprintf("%s/%s-%s.qcow2", tmpDir, diskDstName, id)
+		sizeArg := fmt.Sprintf("%dG", sizeGB)
+
+		cmd := exec.Command("qemu-img", "create", "-f", "qcow2", dstDiskFile, sizeArg)
+		if out, err := cmd.CombinedOutput(); err != nil {
+			return fmt.Errorf("qemu-img create failed: %w: %s", err, string(out))
+		}
+		v.vmi.Config.DstFile = dstDiskFile
+	}
+
 	exe, args, err := v.executableAndArgs()
 	if err != nil {
 		return err
@@ -231,3 +253,32 @@ func TDXEnabledOnHost() bool {
 
 	return TDXEnabled(string(cpuinfo), string(kernelParam))
 }
+
+func GetVirtualSizeBytes(path string) (int64, error) {
+	cmd := exec.Command("qemu-img", "info", "--output=json", path)
+	out, err := cmd.Output()
+	if err != nil {
+		return 0, fmt.Errorf("qemu-img info failed: %w", err)
+	}
+
+	var info qemuInfo
+	if err := json.Unmarshal(out, &info); err != nil {
+		return 0, fmt.Errorf("failed to parse qemu-img JSON: %w", err)
+	}
+
+	if info.VirtualSize <= 0 {
+		return 0, fmt.Errorf("invalid virtual size: %d", info.VirtualSize)
+	}
+
+	return info.VirtualSize, nil
+}
+
+func GetVirtualSizeGB(path string) (int, error) {
+	bytes, err := GetVirtualSizeBytes(path)
+	if err != nil {
+		return 0, err
+	}
+
+	gb := (bytes + (1<<30 - 1)) >> 30
+	return int(gb), nil
+}

scripts/igvmmeasure/igvm.sh

@@ -8,7 +8,7 @@ mkdir -p "$BUILD_DIR"
 
 # Define the target directory for cloning inside the build directory
 TARGET_DIR="$BUILD_DIR/svsm"
-SUBDIR="igvmmeasure"
+SUBDIR="tools/igvmmeasure"
 
 # Clone the repository if it doesn't exist
 if [ -d "$TARGET_DIR" ]; then
@@ -33,8 +33,8 @@ fi
 
 echo "Building the Rust crate..."
 
-RELEASE=1 make bin/igvmmeasure BUILDDIR="$BUILD_DIR"
+RELEASE=1 make bin/igvmmeasure
 
-mv bin/igvmmeasure "$BUILD_DIR/"
+mv "$BUILD_DIR"/svsm/bin/igvmmeasure "$BUILD_DIR/"
 
 echo "Binary stored in: $BUILD_DIR/igvmmeasure"