feat: Bump cloud-hypervisor to v26.0

Author: scuzhanglei

build/virt-prerunner/Dockerfile

@@ -20,13 +20,13 @@ RUN set -eux; \
     mkdir /var/lib/cloud-hypervisor; \
     case "$(uname -m)" in \
         'x86_64') \
-            curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v24.0/cloud-hypervisor-static; \
-            curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v24.0/ch-remote-static; \
+            curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v26.0/cloud-hypervisor-static; \
+            curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v26.0/ch-remote-static; \
             curl -sLo /var/lib/cloud-hypervisor/hypervisor-fw https://github.com/cloud-hypervisor/rust-hypervisor-firmware/releases/download/0.4.0/hypervisor-fw; \
             ;; \
         'aarch64') \
-            curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v24.0/cloud-hypervisor-static-aarch64; \
-            curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v24.0/ch-remote-static-aarch64; \
+            curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v26.0/cloud-hypervisor-static-aarch64; \
+            curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v26.0/ch-remote-static-aarch64; \
             curl -sLo /var/lib/cloud-hypervisor/CLOUDHV_EFI.fd https://github.com/smartxworks/cloud-hypervisor-edk2-builder/releases/download/20220706/CLOUDHV_EFI.fd; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$(uname -m)'"; exit 1 ;; \

cmd/cloud-hypervisor-client-gen/main.go

@@ -18,7 +18,7 @@ import (
 var clientTemplate string
 
 func main() {
-	resp, err := http.Get("https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/v24.0/vmm/src/api/openapi/cloud-hypervisor.yaml")
+	resp, err := http.Get("https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/v26.0/vmm/src/api/openapi/cloud-hypervisor.yaml")
 	if err != nil {
 		panic(err)
 	}

cmd/virt-prerunner/main.go

@@ -43,9 +43,9 @@ func main() {
 	}
 
 	cloudHypervisorCmd := []string{"cloud-hypervisor", "--api-socket", "/var/run/virtink/ch.sock", "--console", "pty", "--serial", "tty"}
-	cloudHypervisorCmd = append(cloudHypervisorCmd, "--kernel", vmConfig.Kernel.Path)
-	if vmConfig.Cmdline != nil {
-		cloudHypervisorCmd = append(cloudHypervisorCmd, "--cmdline", fmt.Sprintf("'%s'", vmConfig.Cmdline.Args))
+	cloudHypervisorCmd = append(cloudHypervisorCmd, "--kernel", vmConfig.Payload.Kernel)
+	if vmConfig.Payload.Cmdline != "" {
+		cloudHypervisorCmd = append(cloudHypervisorCmd, "--cmdline", fmt.Sprintf("'%s'", vmConfig.Payload.Cmdline))
 	}
 
 	vcpuToPCPU := []string{}
@@ -94,8 +94,8 @@ func main() {
 
 func buildVMConfig(ctx context.Context, vm *virtv1alpha1.VirtualMachine) (*cloudhypervisor.VmConfig, error) {
 	vmConfig := cloudhypervisor.VmConfig{
-		Kernel: &cloudhypervisor.KernelConfig{
-			Path: "/var/lib/cloud-hypervisor/hypervisor-fw",
+		Payload: &cloudhypervisor.PayloadConfig{
+			Kernel: "/var/lib/cloud-hypervisor/hypervisor-fw",
 		},
 		Cpus: &cloudhypervisor.CpusConfig{
 			BootVcpus: int(vm.Spec.Instance.CPU.Sockets * vm.Spec.Instance.CPU.CoresPerSocket),
@@ -112,14 +112,12 @@ func buildVMConfig(ctx context.Context, vm *virtv1alpha1.VirtualMachine) (*cloud
 	}
 
 	if runtime.GOARCH == "arm64" {
-		vmConfig.Kernel.Path = "/var/lib/cloud-hypervisor/CLOUDHV_EFI.fd"
+		vmConfig.Payload.Kernel = "/var/lib/cloud-hypervisor/CLOUDHV_EFI.fd"
 	}
 
 	if vm.Spec.Instance.Kernel != nil {
-		vmConfig.Kernel.Path = "/mnt/virtink-kernel/vmlinux"
-		vmConfig.Cmdline = &cloudhypervisor.CmdLineConfig{
-			Args: vm.Spec.Instance.Kernel.Cmdline,
-		}
+		vmConfig.Payload.Kernel = "/mnt/virtink-kernel/vmlinux"
+		vmConfig.Payload.Cmdline = vm.Spec.Instance.Kernel.Cmdline
 	}
 
 	if vm.Spec.Instance.CPU.DedicatedCPUPlacement {