Merge pull request #419 from cfergeau/backwards-compat

Restore backwards compatibility for VirtioNet:ToCmdline()

Author: openshift-merge-bot[bot]

.github/workflows/compile.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
-          go-version-file: go.mod
+          go-version: 'stable'
       - name: golangci-lint
         run: make lint
   build:
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version-file: go.mod
+          go-version: 'stable'
       - name: Build
         run: make
 

pkg/config/virtio.go

@@ -463,19 +463,25 @@ func (dev *VirtioNet) ToCmdLine() ([]string, error) {
 	case dev.Nat:
 		builder.WriteString(",nat")
 	case dev.UnixSocketPath != "":
-		builder.WriteString(",type=unixgram")
-		fmt.Fprintf(&builder, ",path=%s", dev.UnixSocketPath)
 		if dev.VfkitMagic {
-			builder.WriteString(",vfkitMagic=on")
+			// Use the old commandline syntax for backwards compatibility
+			// The pkg/config code is used by other projects as a go module to
+			// generate the command line to start vfkit. There is no guarantee
+			// that the `vfkit` binary these projects are using is the latest
+			// one with support for the new syntax.
+			// https://github.com/containers/podman/issues/27873
+			fmt.Fprintf(&builder, ",unixSocketPath=%s", dev.UnixSocketPath)
 		} else {
+			builder.WriteString(",type=unixgram")
+			fmt.Fprintf(&builder, ",path=%s", dev.UnixSocketPath)
 			builder.WriteString(",vfkitMagic=off")
 		}
 	default:
 		fmt.Fprintf(&builder, ",fd=%d", dev.Socket.Fd())
 	}
 
 	if len(dev.MacAddress) != 0 {
-		builder.WriteString(fmt.Sprintf(",mac=%s", dev.MacAddress))
+		fmt.Fprintf(&builder, ",mac=%s", dev.MacAddress)
 	}
 
 	return []string{"--device", builder.String()}, nil

pkg/config/virtio_test.go

@@ -274,7 +274,7 @@ func TestVirtioDevices(t *testing.T) {
 				UnixSocketPath: "/tmp/unix.sock",
 				VfkitMagic:     true,
 			},
-			expectedCmdLine: []string{"--device", "virtio-net,type=unixgram,path=/tmp/unix.sock,vfkitMagic=on"},
+			expectedCmdLine: []string{"--device", "virtio-net,unixSocketPath=/tmp/unix.sock"},
 		},
 		"NewVirtioNetWithMacAddress": {
 			newDev: func() (VirtioDevice, error) { return VirtioNetNew("00:11:22:33:44:55") },
@@ -402,7 +402,7 @@ func TestVirtioDevices(t *testing.T) {
 				UnixSocketPath: "/tmp/test.sock",
 				VfkitMagic:     true,
 			},
-			expectedCmdLine: []string{"--device", "virtio-net,type=unixgram,path=/tmp/test.sock,vfkitMagic=on"},
+			expectedCmdLine: []string{"--device", "virtio-net,unixSocketPath=/tmp/test.sock"},
 		},
 		"VirtioNetDefaultVfkitMagic": {
 			newDev: func() (VirtioDevice, error) {
@@ -412,7 +412,7 @@ func TestVirtioDevices(t *testing.T) {
 				UnixSocketPath: "/tmp/default.sock",
 				VfkitMagic:     true,
 			},
-			expectedCmdLine: []string{"--device", "virtio-net,type=unixgram,path=/tmp/default.sock,vfkitMagic=on"},
+			expectedCmdLine: []string{"--device", "virtio-net,unixSocketPath=/tmp/default.sock"},
 		},
 		"VirtioNetUnixSocketPath": {
 			newDev: func() (VirtioDevice, error) {
@@ -422,7 +422,7 @@ func TestVirtioDevices(t *testing.T) {
 				UnixSocketPath: "/tmp/socket.sock",
 				VfkitMagic:     true,
 			},
-			expectedCmdLine: []string{"--device", "virtio-net,type=unixgram,path=/tmp/socket.sock,vfkitMagic=on"},
+			expectedCmdLine: []string{"--device", "virtio-net,unixSocketPath=/tmp/socket.sock"},
 		},
 		"VirtioNetUnixSocketPathWithVfkitMagicOff": {
 			newDev: func() (VirtioDevice, error) {
@@ -466,7 +466,7 @@ func TestVirtioDevices(t *testing.T) {
 				UnixSocketPath: "/tmp/test.sock",
 				VfkitMagic:     true,
 			},
-			expectedCmdLine: []string{"--device", "virtio-net,type=unixgram,path=/tmp/test.sock,vfkitMagic=on"},
+			expectedCmdLine: []string{"--device", "virtio-net,unixSocketPath=/tmp/test.sock"},
 		},
 	}
 	t.Run("virtio-devices", func(t *testing.T) {