Merge pull request #2020 from vasileknik76/qemu6-usb

AkihiroSuda · web-flow · commit 70d01777d3f6 · 2023-11-24T12:40:56.000+09:00
fix usb-bus for qemu 6
diff --git a/pkg/qemu/qemu.go b/pkg/qemu/qemu.go
@@ -786,8 +786,8 @@ func Cmdline(cfg Config) (string, []string, error) {
 			args = append(args, "-device", "virtio-"+input+"-pci")
 		} else { // kernel panic with virtio and old versions of QEMU
 			args = append(args, "-vga", "none", "-device", "ramfb")
-			args = append(args, "-device", "usb-kbd,bus=usb-bus.0")
-			args = append(args, "-device", "usb-"+input+",bus=usb-bus.0")
+			args = append(args, "-device", "usb-kbd,bus=usb-bus")
+			args = append(args, "-device", "usb-"+input+",bus=usb-bus")
 		}
 		args = append(args, "-device", "qemu-xhci,id=usb-bus")
 	}

Original file line number	Diff line number	Diff line change
`@@ -786,8 +786,8 @@ func Cmdline(cfg Config) (string, []string, error) {`
`786`	`786`	`args = append(args, "-device", "virtio-"+input+"-pci")`
`787`	`787`	`} else { // kernel panic with virtio and old versions of QEMU`
`788`	`788`	`args = append(args, "-vga", "none", "-device", "ramfb")`
`789`		`- args = append(args, "-device", "usb-kbd,bus=usb-bus.0")`
`790`		`- args = append(args, "-device", "usb-"+input+",bus=usb-bus.0")`
	`789`	`+ args = append(args, "-device", "usb-kbd,bus=usb-bus")`
	`790`	`+ args = append(args, "-device", "usb-"+input+",bus=usb-bus")`
`791`	`791`	`}`
`792`	`792`	`args = append(args, "-device", "qemu-xhci,id=usb-bus")`
`793`	`793`	`}`