neonvm: Add ability to append to kernel command line (#625)

neondatabase · Nov 16, 2023 · f149f2b · f149f2b
1 parent 9c06125
commit f149f2b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/neonvm/apis/neonvm/v1/virtualmachine_types.go b/neonvm/apis/neonvm/v1/virtualmachine_types.go
@@ -116,6 +116,9 @@ type Guest struct {
 	// +optional
 	KernelImage *string `json:"kernelImage,omitempty"`
 
+	// +optional
+	AppendKernelCmdline *string `json:"appendKernelCmdline,omitempty"`
+
 	// +optional
 	CPUs CPUs `json:"cpus"`
 	// +optional

diff --git a/neonvm/apis/neonvm/v1/zz_generated.deepcopy.go b/neonvm/apis/neonvm/v1/zz_generated.deepcopy.go
diff --git a/neonvm/config/common/crd/bases/vm.neon.tech_virtualmachines.yaml b/neonvm/config/common/crd/bases/vm.neon.tech_virtualmachines.yaml
diff --git a/neonvm/controllers/virtualmachine_controller.go b/neonvm/controllers/virtualmachine_controller.go
@@ -1165,6 +1165,10 @@ func podSpec(virtualmachine *vmv1.VirtualMachine) (*corev1.Pod, error) {
 		})
 	}
 
+	if virtualmachine.Spec.Guest.AppendKernelCmdline != nil {
+		pod.Spec.Containers[0].Args = append(pod.Spec.Containers[0].Args, fmt.Sprintf("-appendKernelCmdline=%s", *virtualmachine.Spec.Guest.AppendKernelCmdline))
+	}
+
 	// Add any InitContainers that were specified by the spec
 	pod.Spec.InitContainers = append(pod.Spec.InitContainers, virtualmachine.Spec.ExtraInitContainers...)
 

diff --git a/neonvm/runner/main.go b/neonvm/runner/main.go
@@ -47,7 +47,7 @@ const (
 	QEMU_BIN          = "qemu-system-x86_64"
 	QEMU_IMG_BIN      = "qemu-img"
 	defaultKernelPath = "/vm/kernel/vmlinuz"
-	kernelCmdline     = "panic=-1 init=/neonvm/bin/init memhp_default_state=online_movable console=ttyS1 loglevel=7 root=/dev/vda rw"
+	baseKernelCmdline = "panic=-1 init=/neonvm/bin/init memhp_default_state=online_movable console=ttyS1 loglevel=7 root=/dev/vda rw"
 
 	rootDiskPath                   = "/vm/images/rootdisk.qcow2"
 	runtimeDiskPath                = "/vm/images/runtime.iso"
@@ -469,9 +469,11 @@ func main() {
 	var vmSpecDump string
 	var vmStatusDump string
 	var kernelPath string
+	var appendKernelCmdline string
 	flag.StringVar(&vmSpecDump, "vmspec", vmSpecDump, "Base64 encoded VirtualMachine json specification")
 	flag.StringVar(&vmStatusDump, "vmstatus", vmStatusDump, "Base64 encoded VirtualMachine json status")
 	flag.StringVar(&kernelPath, "kernelpath", defaultKernelPath, "Override path for kernel to use")
+	flag.StringVar(&appendKernelCmdline, "appendKernelCmdline", "", "Additional kernel command line arguments")
 	flag.Parse()
 
 	selfPodName, ok := os.LookupEnv("K8S_POD_NAME")
@@ -625,11 +627,16 @@ func main() {
 
 	// kernel details
 	qemuCmd = append(qemuCmd, "-kernel", kernelPath)
+	var effectiveKernelCmdline string
 	if vmSpec.ExtraNetwork != nil && vmSpec.ExtraNetwork.Enable {
-		qemuCmd = append(qemuCmd, "-append", fmt.Sprintf("ip=%s:::%s:%s:eth1:off %s", vmStatus.ExtraNetIP, vmStatus.ExtraNetMask, vmStatus.PodName, kernelCmdline))
+		effectiveKernelCmdline = fmt.Sprintf("ip=%s:::%s:%s:eth1:off %s", vmStatus.ExtraNetIP, vmStatus.ExtraNetMask, vmStatus.PodName, baseKernelCmdline)
 	} else {
-		qemuCmd = append(qemuCmd, "-append", kernelCmdline)
+		effectiveKernelCmdline = baseKernelCmdline
 	}
+	if appendKernelCmdline != "" {
+		effectiveKernelCmdline = fmt.Sprintf("%s %s", effectiveKernelCmdline, appendKernelCmdline)
+	}
+	qemuCmd = append(qemuCmd, "-append", effectiveKernelCmdline)
 
 	// should runner receive migration ?
 	if os.Getenv("RECEIVE_MIGRATION") == "true" {